]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
windowManager: Ignore error without systemd
authorOlivier Fourdan <ofourdan@redhat.com>
Tue, 18 May 2021 12:04:05 +0000 (14:04 +0200)
committerMarge Bot <marge-bot@gnome.org>
Tue, 18 May 2021 14:31:28 +0000 (14:31 +0000)
On systems/setups not using systemd, a failure to start gsd-xsettings
with NOT_SUPPORTED does not denote a failure to start Xwayland, just
that we're not using systemd.

In that case, we should just ignore the error, otherwise it will prevent
Xwayland to start on such systems/setups without systemd.

Thanks to Rose Kunkel (@rosekunkel) for spotting the issue/suggesting
the fix.

Fixes: 019229c40e - windowManager: Return failure to start X11 services
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4284
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1850>

js/ui/windowManager.js

index 49d3dda22946d30bbf0962efca4adad2c00ecbbc..bacb6dddb5616596bb10facb31ff61ab8dbeed61 100644 (file)
@@ -982,9 +982,10 @@ var WindowManager = class {
             // managed and gnome-session will have taken care of everything
             // already.
             // Note that we do log cancellation from here.
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED))
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED)) {
                 log('Error starting X11 services: %s'.format(e.message));
-            status = false;
+                status = false;
+            }
         } finally {
             task.return_boolean(status);
         }